<!DOCTYPE html>
<html lang="en">
<head>
    <meta charset="UTF-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>Document</title>
</head>
<body>
    <ul>
        <li>亚洲</li>
        <li>唱歌</li>
<<<<<<< HEAD
        <li>约饭--存在bug（bug分支已解决）</li>
=======
        <li>约饭--存在bug</li>
        <li>商城50%-->100%</li>
>>>>>>> dev
    </ul>
</body>
</html>